bitkeeper revision 1.1097 (40f69f48JEkNJ4Hf1ehGiX4W-rIzKw)

Avoid messages of the form: 'INIT: Id "2" respawning too fast: disabled for 5 minutes'

diff --git a/linux-2.6.7-xen-sparse/drivers/xen/console/console.c b/linux-2.6.7-xen-sparse/drivers/xen/console/console.c
index ff76bab3c67603a04d02ca6351f822c3bb5c7ef1..bea0a44e671a6b65725c6069c09e6e61312ac594 100644 (file)
--- a/linux-2.6.7-xen-sparse/drivers/xen/console/console.c
+++ b/linux-2.6.7-xen-sparse/drivers/xen/console/console.c
@@ -535,7 +535,7 @@ static int xencons_open(struct tty_struct *tty, struct file *filp)
     unsigned long flags;
 
     if ( TTY_INDEX(tty) != 0 )
-        return -ENODEV;
+        return 0;
 
     MOD_INC_USE_COUNT;
 

diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
index 5b6677b1978057f0c89aa92efd1681356e1756c7..8e28ed849a412a553f74f104f15d7dc2609af42c 100644 (file)
--- a/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@ -136,7 +136,7 @@ def make_disk(dom, uname, dev, mode, recreate=0):
     """
     segments = lookup_disk_uname(uname)
     if not segments:
-        raise VmError("vbd: Segments not foundXXXXXX: uname=%s" % uname)
+        raise VmError("vbd: Segments not found: uname=%s" % uname)
     if len(segments) > 1:
         raise VmError("vbd: Multi-segment vdisk: uname=%s" % uname)
     segment = segments[0]